Fix Multi-part Upload #1232
Fix Multi-part Upload #1232
Conversation
| return stream.readLine(max_line_length) != "--"; | ||
|
|
||
| enforce(stream.leastSize >= 2); | ||
| auto ub = stream.peek(); |
There was a problem hiding this comment.
This is not a good idea in general (leastSize could return just 1 even if the connection is still open and could yield more data, and peek is not required to return anything at all). But in this case it's possible to just use ubyte[2] ub; stream.read(ub); instead. It has to be either "--" or "\r\n". Both of them terminate the form part.
There was a problem hiding this comment.
For me the peek returns [boundary]--, so maybe I should read the boundary + 2
There was a problem hiding this comment.
That doesn't look right, since the boundary is already consumed above (lines 250/251 and 259). Maybe a peek bug?
There was a problem hiding this comment.
No that's a bug in the content-length reader I implemented on my fork.
The end of stream is not always `--\r\n` in forms, but the boundary is always followed by `--` Use read and an array instead Read only 2 bytes Use nullSink instead of a new NullOutputStream Use enforce
|
Looks good to me now! Merging in. |
The end of stream is not always
--\r\nin forms, but the boundary is always followed by--